Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 27 Apr 2011 17:15:37 +0000 (10:15 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 27 Apr 2011 17:15:37 +0000 (10:15 -0700)

Trivial merge